am ddf26e7b: Merge "Fixing widget overlapping another widget (issue 6475997)" into jb-dev

* commit 'ddf26e7bfeee44ae07242362d18bbf161dd84ea9':
  Fixing widget overlapping another widget (issue 6475997)