Merge "Unlinked providers STILL shouldn't cause crashes"