Merge "Fix undefined fontScale issue in Configuration"