Reduced DB contention in User::saveOptions().

Change-Id: Ic91501cd6476dae54b54b85f2f06c25bd2577c9b
(cherry picked from commit c20e0e05efb6c27cefaf8cc186f281afe69c9ec7)