Merge "MediaCodec: keep callback message for reclaim"