Merge "Fixing up Mediarecorder for MFF"