Merge "servicemanager: Fix loop continue/break" into main