Merge "Remove timeout logic from AppFunctionManagerService." into main