[#ANDROID-341] Add back support for OnSurveyFinishedListener.