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

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

Change-Id: I24b8f59eb427fb0da776982eceb88ac9d64fb8da