Merge "BondStateMachine: avoid adding device to mDevices"