Merge "More grid changes, closer to final specs." into sc-dev am: a9bb9394a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13701885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38d9ea6f51535419d89c1484b6cc4df2c0b6976e