Merge "Clean up CommunalManagerService"