Merge "Fix MediaRandomTest watchdog affecting other tests" into jb-mr1-dev