Merge "Don't throw exception when changing unrequested permission state." into main