Merge "CTA2075: return boolean when adding MediaCodec" into main