Merge "ComponentName null check MUST proceed before creating ComponentKey." into ub-launcher3-calgary-polish