Merge "Resume on Reboot default implementation"