Merge "More on content description for photo editor butns" into gb-ub-photos-arches
tree: 6abd641737f7ff5db424e6e2ea09a61dca2d1f4c
  1. res/
  2. src/
  3. tests/