Track Superuser and Widgets for recovery

* Straight from CM for updates