Merge "[Output Switcher] Modify checking for device isConnected" into tm-dev