Merge "MediaCodec: propagate usage from original surface to release surface" into rvc-dev