Merge "Fix launcher crash when adding widget (issue 6433360)" into jb-dev