Merge "Bluetooth: Handle user switch with new states"