Merge "Use KCM to capitalize characters, instead of toUpperCase()" into main