fix reboot recovery + TWRP config changes

Change-Id: Ic72f6d3a32e941fe30e821bb016639980e9c7afc