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

Change-Id: I5fddcb6d0f55d88712b4d97c76234eea0c1a5f2c