Annotation scroll v2

Reimplement logic to fix #486. Prior implementation would scroll to *any* annotation rather than
just annotations created by the local member.