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

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