Merge "Update lock timeout value after pref change." into nyc-dev