This fixes some problematic behaviour, when the user changed some settings
but has still not made a restart.
(cherry picked from commit 511519e3420eb716616f321f3d0bc630c2261414)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>