Merge "Revise homepage highlight mechanism" into sc-v2-dev am: 7bfe3e869a

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

Change-Id: I0737a0463b51399a9410b238c23094715168f5ae