Merge "Show highlight for device setting items" into main