Merge "MediaCodec: ensure reply does not get lost"