Merge "Improving restored widget behavior" into ub-now-porkchop