Merge "Follow up CL for controller navigation fix" into sc-v2-dev am: 4b878f5318 am: 845ab22dae

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

Change-Id: I6d0d7c048f73b6615e021fd464edee2ecc02b5a1