Align UserPreferencesModel with SettingsModel
Buttons inside a popup support new `data-popup-load-indicator` attribute.
Other minor improvements
Wrapper for set data