Merge "Fix issue with call backs from media process." into lmp-mr1-dev