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