Merge "Tidy up all service state when done executing" into qt-dev
am: 5063579f1e

Change-Id: Id6a202dc50ff69ac8bd917d9164c2cc36934da21