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

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

Change-Id: Ib5ec5655ecc29ff8a98528dffed2cef76f6cf8a9