Merge "Remove unused parameter (package name) from MediaDevice classes" into main