Merge "Do not cancel animations when switching." into jb-dev