Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev