am cc7ce470: Merge "Use the right photviewer resources" into jb-ub-mail

* commit 'cc7ce4700338341d019bf4a90e1cbc63c0c89daf':
  Use the right photviewer resources