Merge "Add null check of MediaDevice"