Merge "Revert "Move Resource creation out of ContextImpl constructor""