Merge "Skip idmap1 generation if target defines overlayable" into qt-dev