Merge "media: adjust time offset in case of time lapse" into nyc-dev am: 7f7052f
am: 2a1f3c8

* commit '2a1f3c808fd9e9a2249fd70b8db0dfd32fb0003e':
  media: adjust time offset in case of time lapse