Merge "Bluetooth: persist state when turning on from BLE"