Merge "hwc: Update redrawing"