Merge "BackendUnifiedServiceManager: tidy up includes" into main