Merge "Check for leniency of calendar in getDisplayNames"