Merge "hwc2: Add dataspace to dump"