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

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

Change-Id: I595846e72121f6505a6cc7dfaaa59dfd007385ef