Toolbar sample should reset removeButtons #10338.