Merge "Fix lock contention while swiping up" into ub-launcher3-edmonton