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

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