Merge "Define constants for ellipsize values"