Merge "When we update the folder the user is viewing, clear the items cache." into jb-ub-mail