Merge "Give resume_on_reboot key as separate context"