Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev