Merge "hwc: Do not use ABC when geometry is changing"