Merge "Fix sort label truncated and update string char limit"