Add a "collapse" tooltip, in addition to "expand"

Follow up to Ibbd6e2b58c58a6a1ed46aaf1e8f1a685c89d51fc

Change-Id: Ia68d9c1691a8880098fcb87efc2dcf0c5c1c7e96
Merge "Add a "collapse" tooltip, in addition to "expand""