Merge "media.bufferpool2: Ensure uniqueness of connection id" into main