Merge "Eliminate recents upload jank" into nyc-mr1-dev