Merge "Fix crash in recents" into jb-mr1-dev