Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev