Merge changes I71f5b0fc,I92c7accb

* changes:
  Moving decision to use still camera to CameraSourceTimeLapse
  pass auxiliary video parameters.