Merge "Merge "Optimize App -> Recents" into oc-dev am: 22f8290879" into oc-dev-plus-aosp
am: dcfc1aaab5  -s ours

Change-Id: I109b07b5e7f3aadbe454525190b8c1f1cbe0dfbb