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