Fix on pause and continue discovery.
Merged with ui upstream.