removed dialog on Android
Merge branch 'DA-423' into unstable

* DA-423:
  removed dialog on Android