am d906713f: am 1cea05ac: Merge "Make widgets work again" into jb-ub-mail-ur9

* commit 'd906713f3707e763f8bca8e2f5bbe619e2361087':
  Make widgets work again