Merge "Use software encoder for time lapse capture."