Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev