Merge "Allow for a configurable WiFi restore bounce delay"