Properly teardown TOC widget

Change-Id: Ib115024b4e50ac379e5b8689ae796fce3586d386
Merge "Properly teardown TOC widget"