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