Merge "Don't send onDeviceDisappeared when device is connected" into sc-dev