Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev