element-x-android

b5493779 - Merge branch 'develop' into sync-localazy