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

Change-Id: If95aeffd5132f8cdafb837db47ce9ea99f32f516