Stop Switch Delay

Change-Id: I7d20f2eb023f8b1cc8c83db1cc5e6255b93f10f9