Merge "Merge "ImageWriter: increase timeout for BufDetachThread" into qt-qpr1-dev am: 997adc05" into qt-qpr1-dev-plus-aosp