Merge "media.log cleanup" into jb-mr2-dev