Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2 * commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725': Fix possible NPE in the code that restores widgets' state.