am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.

Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken

* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.