Move the contextRootMap to the ActivityService, it was in the Activity