Merge "Fix QSB and Hotseat positions when ENABLE_DEVICE_SEARCH is enabled" into sc-dev am: ff78367361

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

Change-Id: I59894b7656d08c002357ea061798c650cb3a8a4f