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

Change-Id: I9662fd9d10f6af74e14d58b65b99a42bfa94e505