Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev