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

* commit '4d6a0df37930309f8e138499785483d9dcadf7d9':
  Do not cancel animations when switching.