Merge "hwc: fix aspect ratio calculations"