Merge "Revert "Wait for the dying app fully killed on getting content provider""