Merge "Proper clean up when Ui test automation service is unregistered or dies."