Fix overlay only appearing after the map was moved
Merge remote-tracking branch 'fodaro/master'