Merge "Remove no longer needed QUERY_USERS permission" into sc-dev