Merge "Fix widget span" into tm-dev