Merge "Tidy up all service state when done executing" into qt-dev