Only collapse folder when icon is clicked

[cjohnson19]

Implements a version of this feature request #7908 (comment) which attempts to simplify workflows which modify folder properties between requests.

Behavior implemented expands a folder when clicked anywhere within the menu item, but only collapses it when the folder icon is clicked.

[CLAassistant]

All committers have signed the CLA.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}