am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoViewActivity

* commit '9860d23d1eb9e2c00a820a98ec25550e139f1e35':
  DO NOT MERGE: Fix NPE in PhotoViewActivity