am 879627a5: Merge "Make sure we properly clean leave behinds after undo is tapped." into jb-ub-mail-ur8

* commit '879627a51cd2913b8ea0d68ca199a2fdc4ca4453':
  Make sure we properly clean leave behinds after undo is tapped.