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

Change-Id: Ia3e69d2654e2dcf3e3cb60b45c12a0271d141af2