Merge "Update namespace of flag update_client_profile_priority" into main