Merge "Improve locking/unlocking in *_set_params()."