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

* commit '22396b08ef0e1910b120eda7298a34e82af6cd0c':