Merge "hwc2: Fix dataspace comparison"