Merge "Refactor onProviderStateChangedOnHandler" into rvc-dev