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

* commit '9076751959397fb06f55fc4351009d105d08de3f':
  Fix launcher crash when adding widget (issue 6433360)