Merge "Match updated redlines for shortcuts." into ub-launcher3-calgary