Merge "Move certain internal activity manager methods to new class." into klp-modular-dev