Merge "Fix an IllegalStateException in the OverlayConfigParser"