Reduced DB contention in User::saveOptions().

Change-Id: Ic91501cd6476dae54b54b85f2f06c25bd2577c9b
Merge "Reduced DB contention in User::saveOptions()."