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

Change-Id: I2aa5e9e671d6c206c87792d2c3759c4e797f4ee2