am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev

* commit '384a04d93622c764bf1e8a69c288957d78b6a4e4':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement