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