Merge "Fix shortcut size calcuation" into sc-dev am: 372e85106d am: c044b3065e

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

Change-Id: I6eb7163e46b4d087a110f0cc9b15d3f987659b40