Merge "Fix NPE in removeGeofence" into qt-dev