Merge "Don't clear associated views before snapping them back to position." into jb-ub-mail