Merge "Create a per-boot key on each boot"