Merge "Fix null locale edge cases in Configuration and Resources"