am 6be55ef0: Merge "Fix leftover issues from moving to a folder type bitmask" into jb-ub-mail-ur9

* commit '6be55ef040cf910f78571dbe4df1551a0bf2661b':
  Fix leftover issues from moving to a folder type bitmask