Merge "switch back to svc power reboot by default"