Merge "Add missing break in BaseServingState" into main