am 5663e9c2: Merge "Fix folder NPE in DrawerItem" into jb-ub-mail-ur9

* commit '5663e9c2adcddd43a01429cac018c77aa86428a2':
  Fix folder NPE in DrawerItem