am d5058a53: Merge "Improving restored widget behavior" into ub-now-porkchop

* commit 'd5058a534e1ec5cdf15682a604832c18f572299c':
  Improving restored widget behavior