Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev
am: b54af92  -s ours

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