Merge "Reduced DB contention in User::saveOptions()."