[Android] Keep only one instance of VFListener
Fix merge conflict with upstream dev
Merge pull request #42 from leotilli/azure_services_incorrect_project

[Android] Fix incorrect project after adding activity to new project