Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev