Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE"