Merge "ImageWriter: Do not override UNKNOWN format twice" into qt-qpr1-dev