Merge "Wait for uncrypt to finish before rebooting"