Merge "Adding null check to outline generator" into ub-launcher3-burnaby