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

* commit '74366d6fe8cfb7f281285206e40f7c897ca61c4e':