Merge changes from topic 'wifitracker' into oc-dev

* changes:
  Use synchronization rather than locking in WifiTracker.
  Remove all pending callbacks in stopTracking.