Merge "Exclude SipCallOptionHandler from recents" into klp-dev