Merge "SIP: add a helper class to run listener callbacks safely and misc fixes"