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