Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"" into oc-dr1-dev