Merge "hwc: Do not enable swaprect when rotation is involved"