Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
tree: b85d432aa5325adc219b390eb11a42c46fbf4c14
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/