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

Change-Id: I234d5ef6594227fa62a36230cf572cc369633ef1