Pull in MaterialZ fix
Implement tool-specific cursors