Merge "Refactor MediaCodec restart flow" into main