Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev