Merge "Update display name of MediaDevice"