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