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

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