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