Merge "Workaround for USAP support in jitzygote." into qt-dev