Merge "forward fix VoipCallMonitor regression" into main