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