am 3d567ad5: am cb0ec764: am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop

* commit '3d567ad54a4eac80807dd532b975baf1d735990b':