Don't autostart EIP if the user explicitly stops the service

No changes file because it's still an improvement over another previous unreleased improvement