CameraWrapper: Disable face detection for ZSL on JB cam

- face detection enabled causes crash in frameproc for ZSL shots
  after flash has been used and then turned off (JB camera)
  JIRA: CYAN-5583

Change-Id: Ieed01654b3a4c6dc3d267cff366fd1589eabe96f
CameraWrapper: Present mot-hdr-mode as HDR scene mode

Change-Id: Ic7dd594f34d9d05b97bd456bef86f1c3e7dfa945
Merge branch 'cm-11.0' into stable/cm-11.0