Merge "Fix folder NPE in DrawerItem" into jb-ub-mail-ur9