Merge "Fix NPE while flipping through pictures." into ics-mr0
tree: 7722458164158f0f0cd457dc508de2544345e49a
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/