Merge pull request #23978 from nextcloud/enh/query_servercontainer_first

First query the server container

lib/private/ServerContainer.php

@@ -133,6 +133,12 @@ class ServerContainer extends SimpleContainer {
 	public function query(string $name, bool $autoload = true) {
 		$name = $this->sanitizeName($name);
 
+		try {
+			return parent::query($name, false);
+		} catch (QueryException $e) {
+			// Continue with general autoloading then
+		}
+
 		// In case the service starts with OCA\ we try to find the service in
 		// the apps container first.
 		if (($appContainer = $this->getAppContainerForService($name)) !== null) {