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

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

Change-Id: I087198e87a1d27ff1688e3414884d935ff717886