element-x-android

3a86605e - Merge branch 'develop' into feature/bma/notificationFallbackCounter