Merge "Revert "Change who gets marked for the cost of transcoding"" into sc-dev