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

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