Merge "Fix launcher navigation issue when using a controller" into sc-dev am: 45e72a1ed3

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

Change-Id: If450a4f026d6b59e05d8bba86a3a654cb5c2b745