Merge "Allow custom event handlers for the click event of toolbar buttons"