Merge "Fix regression where nav bar shows when taskbar is showing" into sc-v2-dev am: 4b916764a4 am: 2a94943e5d

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

Change-Id: I162e69da40fec8a092d50ef67f2892128abbaf0b