Merge "MediaCodec: more buffer state cleanup" into main