Merge "Check Bluetooth app id instead of uid"