Merge "Use English locale for number format in layoutlib"