Merge "Revert "Added controller is-connected code""