Merge branch 'address-collection' of github.com:securekey/openmidaas-android-app into address-collection