Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
tree: 954fd3bfa6358e6d0a9d5a6718910fbe5c080b96
  1. gallerycommon/
  2. jni_mosaic/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/