Merge "Turn ContentProvider injection failures into errors." into main