Merge "ImageWriter: increase timeout for BufDetachThread" into qt-qpr1-dev