Avoid modifying map.logos_ with each frame
Merge pull request #2875 from tschaub/orphan-logos

Avoid modifying `map.logos_` with each frame.