Merge "Don't reboot into recovery during userspace reboot"