Bug 1070719 - On restart, wait for stop before starting