am ddb29c42: am 74366d6f: am 22396b08: am d5058a53: Merge "Improving restored widget behavior" into ub-now-porkchop

* commit 'ddb29c4219c8434a72da1df410bb875926b5daea':