Remove deprecated recovery flags, enable touch recovery

Change-Id: Id874ecdb6f6d26f2958b361f35e1035c69e8a9cf