Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev