Merge "mm-video: vdec: honor resolution set on output only if scalar is enabled"