Annotation repositioning doesn't play nice with infinite scrolling.  Can no turn infinite scrolling on/off.  Fixed an ordering problem.
Fixed bounding box problem.
Merge remote-tracking branch 'upstream/develop' into develop