* commit '721159159f1c0e100150512c392141830eaebba2': Clean up app following death when creating service