Merged XContentService into XContentResolver (XPrivacy 3)