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

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

Change-Id: I461eac682ec5153f7cad6220d88a9b01ba9dc39a