Merge "Don't intercept above shelf progress if still animating" into ub-launcher3-edmonton-polish