Merge "Fix save()/restore() issues in the OpenGL renderer."