Merge "Fixed sanity cache clear in User::saveSettings()"