Merge "Switch to ConcurrentHashMap for CompatConfig"