Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev