am f0f78ed0: am 199d541c: Merge "Trim widget names" into jb-mr2-dev

* commit 'f0f78ed090f8957058563a71983f94002b4f2dee':
  Trim widget names