Merge "Fix MediaCodec potential use-after-free" into main