Merge "Fixed service state changed event"