use ActionBar in image viewer
Merge branch 'DA-354' into unstable

* DA-354:
  use ActionBar in image viewer