Merge "hwc: Fix src split bugs"