Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp * commit '7d4134a1a67872c056d05330b1453395a7c8c4d1': Fix possible NPE in the code that restores widgets' state.
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp * commit '7d4134a1a67872c056d05330b1453395a7c8c4d1': Fix possible NPE in the code that restores widgets' state.