Merge "Fix shortcut size calcuation" into sc-dev am: 372e85106d am: 16c9ebabbf am: 46663a4e89

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

Change-Id: Ia3243e5297f2be4b6daba25cfee4d582b471731a