Revert "Merge branch 'SurveyViewController' into Development"

This reverts commit 177973451354ceeff4c5b931592e62f94193ded4.