Merge "media: adjust time offset in case of time lapse" into nyc-dev