Merge "If userspace reboot watchdog triggers, don't store reason in persistent property"