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