Fix #1633, SceneModePicker problems with non-default mode on startup.

This also fixes an issue where non-3D modes would start by "morphing" from 3D.  Now you can start directly in 2D or CV without the morph-on-startup effect.