Merge "Lazily load the FolderUri's comparison Uri" into jb-ub-mail-ur10