Merge "Fixing a crash/ Launcher3 doesn't have predicted apps" into ub-launcher3-calgary