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

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