Merge "Enable media format shaping by default" into sc-dev