Merge "hwc: Refactor windowboxing feature"