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: Iae32e7a3e90332723b5aeb2897d559a7a9e101a5