Merge "ServiceStateTracker notifies via ContentProvider"