fix double avatar updation in profile screen
fix compile errors on Android
Merge branch 'DA-381' into unstable