Merge "[Media Quality] Add User Ids to all methods" into main