[Bug 1002420] Reduce flickering of map canvas