Merge "Fixing widget pane gap issue. (Bug 6476996)" into jb-dev