Merge "Change naming in dispatchUpdates to reflect Bluetooth permissions" into main