Merge "Prevent against NPE inside ComponentKey" into ub-launcher3-calgary-polish
am: c760da5688

Change-Id: I0f05bb5ce62145f375d7927efe3d7341cc045ee6