b5abedbd5c
* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436': Clean up activities and displays when done
* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436': Clean up activities and displays when done