PopupView and PopupNavigate fix when null options
Merge branch 'ViewOptionsFix'