Merge "Reduce MediaFormat shaping verbosity" into sc-dev