Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95' * commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95': Fix possible NPE in the code that restores widgets' state.
Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95' * commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95': Fix possible NPE in the code that restores widgets' state.