bug 843762, bug 842215 - Fix regression
bug 842215 - Don't track mousemove targets in Settings