am 0f015b7e: Merge "Merge "Fix for panorama icon not always showing up in photo viewer"" into jb-ub-mail-ur8

* commit '0f015b7e12c1588a332d623f503722e0d394c01c':
  Merge "Fix for panorama icon not always showing up in photo viewer"