Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev