Merge "Honor subsampling when calculating widthInSamples and heightInSamples" into rvc-d1-dev