Improved deep-click handling of topic collapser toggle

Change-Id: I69a69bf7e358ae344bf1a7009de8760b0919580b