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

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

Change-Id: Ie0ed78e783db477c09b0146ed6c4cf09c85b4706