am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode