Merge "Fix a multi device Bluetooth connection scenario." into oc-mr1-dev