am 40828eab: am 91834235: Merge "Fix NPE when widget configuration activity is rotated (issue 6556784)" into jb-dev

* commit '40828eab739af1ddc699d9c96e410ef1f107209d':
  Fix NPE when widget configuration activity is rotated (issue 6556784)