Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev