Merge "Fix NPE when user goes into maps navigation mode and tries to split app." into main