camera: Clear any leftover scene modes when entering video mode

 * HDR scene mode might still be set when entering video mode, since
   we don't reset the hardware during the transition anymore. This
   can be incredibly bad on some devices such as JF, who get wildly
   confused when one tries to do a video snapshot while recording.
 * Fixes the crash on JF, possibly other issues as well.

Change-Id: I635f65742ab1f73cfeeec0890d31208502b146f5
camera: Re-add workaround for freeze when recording stops

 * Device-specific issue. Readd until driver is fixed.

Change-Id: Ic57a6ebeb40370c0e4cb25eef37dfc0eec8717a2
Revert "camera: Enable face detection parameter if required"

This reverts commit 321e62c4b58f35b2ba56ab7fceb4c57cb31dce5f.

Change-Id: Ib78f851f11490592324b3af003120bc66f754b55
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2