Merge "Fix recents list for multiuser" into jb-mr1-dev