Merge "Fix synchronization in BT connection policy"