Merge "Fix MediaPlayer trigerring transcoding" into sc-mainline-prod