Merge "hwc: Do not use visible regions when scaling is involved"