am 995c25bb: Merge "split active user animation across switch."

* commit '995c25bbcb0116eaa4010fb2635ea8ad00c0441c':
  split active user animation across switch.