Move On-The-Spot reset dialog into main dialog

This commit https://gerrit.paranoidandroid.co/#/c/4662 just combined with removing first version of the reset dialog

Change-Id: I061e62bb88ee94bd68e6255cb39e22aa2abdc9d4