Merge "Fix spring loaded scale when taskbar is present" into sc-dev am: 9187337d15

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

Change-Id: I976f6989ca91ac616b6b5f6c59dd33a5cadec305