Merge "Fix taskbar layout issues in setup wizard" into sc-v2-dev am: e202a64e56 am: e88faac7ce

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

Change-Id: I4828b7340c47a08c79048f3b19f2b100a81dc9f1