Merge "Fix jank in launcher" into ub-launcher3-master