Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb