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

* commit '199d541c8d5a62551e7d78559824a52270e8cb13':
  Trim widget names