Merge pull request #5115 from leoetlino/proper-location-for-es-stuff IOS/ES: Move shared content map, uid.sys code
