Trim widget names

Bug: 8617506
1 file changed