Merge "Fix controller navigation on two panel launcher home" into sc-v2-dev am: 7f569f14b4

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

Change-Id: I2414078c267aeec335bc4ef433cc78270af3cc46