am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce

* commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414':
  Fix for popuping being hard to dismiss
tree: b6968c0aba82d76c77dccb9ff69a7f5cefaa7cba
  1. jni_mosaic/
  2. res/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/