Merge "Remove volumePanelBroadcastFix flag" into main