Backporting master to unstable

This improves robustness, as the app will be restarted if it isn't running.