Merge "Make ConnectedDevice page handles bt intent"