Merge "Reposition Undo Bar if user enters into conversation before or while the animation is running." into jb-ub-mail