Merge "ServiceStateEvents don't need to called with the mServiceState lock anymore."