Merge "servicemanager: set consistent flags for self-reg" into main