Merge "Documentation fix: Permission grant opt-out" into sc-dev