am 687f6934: Merge "Change FolderType to a bitmask" into jb-ub-mail-ur9

* commit '687f69342a40b191d2236d2e259430eebbc33fb4':
  Change FolderType to a bitmask