Merge "STS test fix for Android Security CVE-2020-29368" into qt-dev