Bug 1035277 - Add option to not restart b2g....

Nit: Instead of if else, you can `return` in the simpler case to avoid deep nesting