Merge "Support reassembling fragmented media events" into main