Merge "Trim widget names" into jb-mr2-dev