Merge "hwc: Enable swapRect for multiple updating layers use cases"