Merge "Added controller is-connected code"