am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev

* commit '16744ac3f7b030f1192d298132256ac06eaff205':
  Defer removal of activity until animation complete.