Merge "Cleanup ServiceState.toString()"