Merge "Fix MultiTogglePreference highlight issue" into main