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

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