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

* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done