Merge "Properly support service state override"