Merge "Fix ResourcesManagerTest to use Configuration#setToDefaults()"