Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
tree: 2e17da18179909883759a343e63a3d9e0ecb393d
  1. res/
  2. src/
  3. src_pd/
  4. tests/
  5. tests_camera/