Merge "Grid change polish bugs." into ub-launcher3-dorval-polish
am: 184f018ea1

Change-Id: If4ccbbb74307d594882793c8c7eeb6a17b66f914