Merge "resourceloader: Use null-objects for 'sources' and 'registry'"