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