Disclosure animation happens after rebuilding tree

Also ensured that the expanded item in the treeview
was selected after a change in it's expanded state.

Fix for issue #436