Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev