Merge "Revert "recovery: change the way of rebooting when using power key combo""