Merge "Fix null point exception on MediaDevice" into rvc-dev