DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f
am: 50af72b  -s ours

* commit '50af72bcc5f5d84831d57333e64f439fcf125795':
  DO NOT MERGE Don't reject "thumbnail mode" setConfig