Merge "Use split thumbnail width/height directly" into sc-v2-dev am: 5394db834f am: d5bb753fb0

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

Change-Id: I1af553df752b9ae143c1e25b22bf9c715acc9ebb