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

Change-Id: Ie2828bc7abf0c3caef2d10c87770be75a1e7f3e8