Merge "Clean up activities and displays when done" into klp-modular-dev