Cm 11.0

Camera: Remove merge artifact

Camera: Avoid redefinition of ISO params