Merge "MediaFormatshaper off below 320x240" into sc-dev