Merge "Disable ConnectedDeviceConnectedActivity"