Resolve "Firmware update alone doesn't trigger a reboot when "reboot and update" is clicked."

Closes #2228 (closed)