Merge "Fix ContentProvider removal bug" into main