am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0

* commit '40ac84e663e89a25540751075db1ff597124de66':
  Fix NPE while flipping through pictures.
tree: 1e0be4a83802f2e328268b6ac5d6e73f2b913b44
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/