Merge "hwc: Fix scaling issue in copybit."