Configurable timeout before snapshot

Change-Id: If1524324f1942450382c395f5e91b11d2ff20ea9