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

Change-Id: I7d1946267cfe2ea848850cac494dd2a8bd383755