Merge "hwc: Fix swap interval zero"