Camera: fix scene mode breakage caused by soft-hdr feature

Change-Id: Ic01645afaeb973f799b39dbea7d9ce347d3d59dd
Merge remote branch 'cm/cm-10.1'