Merge "Don't free resources if service is actually in use"