Merge "Unregister Waiter in waitForService"