Merge "Fix permission dialog button strings for non-location groups" into sc-mainline-prod