Merge "Fallback to default handling when session volume handling is fixed" into main