Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev