Merge "Fix regression for answering a ringing call when there are 2 calls already." into pi-dev