Merge "hwc2: Fix cursor tests"