Merge "CameraSource: Fix time lapse video recording" into nyc-dev
am: 7eb42678f6

* commit '7eb42678f6f7fa3f6f0b530144eced69c98069fe':
  CameraSource: Fix time lapse video recording