Merge "Taskbar layout update" into sc-v2-dev am: a72e9e20bf am: f703600a8a

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

Change-Id: Idc4f8932d94a215231076269b2d6fb18611a8188