Constrain map switcher pop-ups to map bounds.
Merge branch '#122/constrain-map-switcher-pop-ups-to-map-bounds' into develop
Merge remote-tracking branch 'upstream/develop' into develop