Merge "ImageWriter: configure surface to use user specified format" into qt-qpr1-dev