Merge "media.bufferpool2: ensure message-ids are safe from overflow/underflow" into main