Merge "SIP: fix keep-alive measurement and increase the timeout."