Camera: separate settings for color effects and jpeg quality

Store color effect and jpeg quality settings for the camera and
video camera in their own separate preferences.

Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1