Cherrypicking: 128341 merge from batched_water_trace_topology_fix 128342 merge from streamermode_respawn_fix 128343 128345 merge from reduce_store_hero_traffic 128346 merge from friends_fix 128349 merge from twitch_feature_img