Merge "Make GrantPermissionsActivity more null safe" into sc-dev