Resolved null pointer exception when using back button in ChoiceActionActivity, fixes #37