Merge "Merge "Sets a simple locus id when Overview is enabled" into sc-dev am: e43edc74ef am: 2f3d6822d4" into sc-v2-dev-plus-aosp am: 9841e146eb

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

Change-Id: I5c697471a31f93af1c486025be2d7474436beff5