am e4f2f6ce: Fixing up widget layout to be flexible (issue 5290371)

* commit 'e4f2f6ce11bf294c106369ded631507bd4909c9f':
  Fixing up widget layout to be flexible (issue 5290371)