Merge "Use separate switch ops for runtime permissions"