Merge "Launcher grid changes." into ub-launcher3-dorval-polish