Merge "Force a repaint when hwc invalidate hook is called"