Merge "Support reassemabling fragmented media events" into main