Merge "Whitelist reboot reasons related to userspace reboot failure"