Camera Wrapper: Only call cancel_auto_focus when the preview is enabled.

Change-Id: I2a26ba8bac3ef84f49ea5897cdeedbb5c0724e2b
msm8960: Unbreak network mode options

Change-Id: I3dcfedef08693587b0a1b35c45ef434797c0f32c
Merge "msm8960: Unbreak network mode options" into cm-11.0
Merge branch 'cm' into HEAD