Fix force close at bootupreceiver

also start to move all methods in a generic "restore" method

Change-Id: Idc71666434f54373a42d60d5315eb4a3e9d5ae9b