Merge "Support Resume on Reboot"