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

* commit 'c3aef0156a1d52315098de7fb2e311f50b16970e':
  CameraSource: Fix time lapse video recording