Merge "Fix problems with new PowerManager.reboot() implementation."