Merge "Camera: fix format overriden logic" into qt-dev
am: ae59ab3159

Change-Id: I337cb3a7981f73f18e86ca1a7847a2a9657b2a1d