Merge "BUG-2673: deprecate ListenerNode,Tree and Walker"