Merge "Add mainline module skipping for CVE-2020-0213" into qt-dev