Merge "Move WakeupTimer out of SipService."