Merge "MediaCodec: implement detach surface" into main