Merge "Fix bug with preloading recent tasks" into jb-mr1-dev