Merge "Fix media stress tests." into lmp-sprout-dev