Merge "Move the FolderItem outside to a separate class." into jb-ub-mail-ur9