Merge "Don't reset the reported proc state while cleaning up the process" into sc-dev