Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev