Merge "hwc: Fix code handling downscale limitation"