Merge "Don't treat service as enabled if in disabled list"