Merge "Skip updating flags for a permission that's not requested." into rvc-dev