Merge "Fix bugs with quickstep springs." into ub-launcher3-master