Merge "hwc: Fix Pause/Resume issues"