Merge "Fix a couple issues with swiping up from home" into ub-launcher3-edmonton