Move the scheduling of service restart upstream from onDestroy().
Comment.

HEAD^ cherry-picked a commit from potential fix to issue #51.