element-x-android

427259f3 - Merge branch 'develop' into feature/fga/unlock_settings