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