v2.5 CL issues

+ issue 53: reset device tracking
+ issues 51,53,54,56: map toolbar buttons becoming nilled
+ issue 58: added invalid table row index check
+ 52/59 spurious/untrackable