Merge "Separate ModifyInstallerPackageTest cross package installer takeover test" into qt-dev