Merge "Eliminate recents upload jank" into nyc-mr1-dev
am: e733f862f0

Change-Id: I7629c4ea0fa1629569065687668500e169717101