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