Merge "Fix bug where Recents wasn't always properly updated" into jb-mr2-dev