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

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