Merge "hwc: Sync for rotator"