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

Change-Id: I652bc8ddd5a8173a5db22b7642195b5d8d919ef8