Merge "Correct the computation of the cell size." into sc-v2-dev am: bdddc5ab0c

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

Change-Id: I423e5002109981583da637fa3f13a91fa7b595e5