Hygiene: Use topic-title-list for CategoryOverlay

Follow up: Ia870a9f9b63da5c4f5656dcc274f1fb950a08ce7

Change-Id: I93a2239afcb9e3bdd9516d90ca49b9f0cec03a74
Merge "Hygiene: Use topic-title-list for CategoryOverlay"