BUG: fix crash on switching to compare view with fids.

Re-order render/update requests in AddWidget, and check for active
camera and current renderer.
Cleaned up some code left over from Annotations (control points).

Issue #1690