Merge "Fix deadlock in GeofenceManager"