Merge "Improve transition out of recents" into jb-dev