am debc5123: Merge change 9125 into donut

Merge commit 'debc51233f0b2f3de06c494319fdab00585ad31e'

* commit 'debc51233f0b2f3de06c494319fdab00585ad31e':
  Fix bug 2022547. Show zoom buttons only when click on photo area.