Merge "Clear cursor when switching between accounts" into jb-ub-mail