am af811bb2: Merge "Increase max number of EXIF tags." into jb-mr1-dev

* commit 'af811bb211499d23ddb0a8dee0a1293dc9805a0d':
  Increase max number of EXIF tags.