Trim widget names

Bug: 8617506

Change-Id: I2f7137b4b5255820af1fb2437caf3da0c163fff7