Merge "Reboot device after test for cleanup" into rvc-dev