Merge "Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"" into qt-dev