Merge "hwc: Do solidFill for each region instead of union of all"