Merge "Cleanup after ActivityView" into klp-modular-dev