Clean up initial map extent logic.
Merge branch '#131/clean-up-initial-map-extent-logic' into develop