Merge "Grid change polish bugs." into ub-launcher3-dorval-polish