Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"