Merge "Use the system server identity before binding the service" into main