Merge "Fix ellipsizing of emoji symbols in StatisLayout." into cm-11.0