Merge "Add a Settings option of "Disable automatic update"." into nyc-dev