Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev