Camera: separate settings for color effects and jpeg quality and white balance

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

Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9

Conflicts:
	src/com/android/camera/VideoController.java
workaround for video torch mode

Change-Id: I9a4c2ad5cb5a9b962bbb31c7b80905aa058029bb