Merge "Fix widget resizes that shouldn't (issue 6380435)" into jb-dev