Merge "Optimize App -> Recents" into oc-dev