Merge "Don't back up apps in the 'stopped' state" into klp-dev