Merge "Resume in-progress operation after reboot." into main