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

Change-Id: I26ae2a8ec326db88491ec885d3ff4ade7cce16f2