am a92e06de: am a00673c7: Fix issues with the new widget layout

* commit 'a92e06def4fd0d8800059d63530248c2d8745dc7':