Merge "Add a string when unstarring causes an undo operation." into jb-ub-mail