Merge "hwc: Enable swapRect for overlapping use-cases"