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

Change-Id: Ic475d75d0480c17d7616ac649471e4ddbe5341aa