Merge "media: add detachOutputSurface API for MediaCodec" into main