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: I62300ff660d66fd06be206bdbd6e3e2641a29962