Merge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev