Merge "Add safe-mode reboot to PowerManager" into nyc-dev