Reboot handler cleanup

We need a timeout here, just in case something goes awfully wrong and the state is never changed.