Merge "Fix updateBluetoothStateLocked comments" into sc-dev