Merge "Fix NexusLauncher NPE" into ub-launcher3-calgary