Merge "Align 3 button nav with hotseat" into sc-v2-dev am: 2a7c0c4ed8 am: da87bc753d

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

Change-Id: I0ff83b0cc9840948b62a4d675787e72f4724c1a6