Merge "Fix some jank with transitions" into ub-launcher3-edmonton