Report trace timeout during cleanup in UI.

Also fix some bugs with cleanup.

Bug: 374879953
Test: manual
Change-Id: I82018e58872bbc2bdba531f4fecb6f9c13652a44
3 files changed