Merge "Try to reduce stale cache updates in User::saveSettings()"