Merge "Dismiss leave behind changes" into jb-ub-mail