am 12f0104e: am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev

* commit '12f0104ec729346d078a0afc9a79ab9fc023cce0':
  Do not cancel animations when switching.