update UI on main thread
Merge branch 'DA-402' into unstable

* DA-402:
  update UI on main thread