Merge "Cleanup and simplify MediaDevice-related classes" into main