Merge "Fixing window transform not changing monotonically with shift" into ub-launcher3-master