Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev am: 2660111259
am: 4c7317373c  -s ours

Change-Id: I7054561b72b89871318e17c2948c69a85bd654d5