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

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

Change-Id: I4a95e767af6bc7b8c88b341b5b3a23e3400e6442