Fix #8561 - Handle change layer in node tool