Merge "Clean up MEDIA_DEVICE_NAME_FIX flag" into main