Merge "Add sysprops for start & end of userspace reboot"