Merge "Revert "Dedupe resource config pointers""