Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1