Merge "[Settings] Remove logic to restore highlight to 0th item in SettingsActivity." into main