Merge "Remove account from widget folder selection" into jb-ub-mail-ur9