Merge "Independent methods to enable/disable BLE mode"