am a321a35a: am d99ba11a: Fix widgets

Merge commit 'a321a35a6a7a7a1e62a8a3948fd891afae690504'

* commit 'a321a35a6a7a7a1e62a8a3948fd891afae690504':
  Fix widgets