STS-3564: Fixes to relaunch button