Merge "Update prebuilt shims" into qt-dev