Fix crash caused by trying to present a survey on top of a viewcontrolle...

...r that was itself being presented


Has unit test thtat fails on old code and passes on new.