Merge "Better tuning hooks for mediaformatshaper" into sc-dev