Add update check timeout and update check skip (#2000)

Add update check timeout and update check skip (#2000) #1094