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

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