Merge "Ensure surface control is valid before trying BBQ update" into main