Merge "Use internal SubManagerService" into main