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

* commit '1cea05ac37523dff68f63dc66799b97522f734d4':
  Make widgets work again