Merge "Making RescueParty reboot and factory reset synchronous." into main