am cb359697: Merge "DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev

* commit 'cb35969708e88057bda7c54c7b3ac1d606ad95c5':
  DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale...