Merge "Revert^3 "Turn ContentProvider injection failures into errors."" into main