[MH,RG] Add something in the TossActivity to wait for the next step and also fix the problem with the service