Merge "Fix geofence crashing bug"