Merge \"Fix NexusLauncher NPE\" into ub-launcher3-calgary
am: 94c6b11bf6

Change-Id: I1e2c363964dbf66cd27e2145f6e116755da42e4d