Merge "Wrap legacyExtra generation in targetsdk check" into qt-dev