am 3af87599: am f52db06c: Merge "Two calls screen is not displayed on multiple SIP calls" into mnc-dev

* commit '3af87599845344cf9a472bbc1dc849ea7cf1de7a':
  Two calls screen is not displayed on multiple SIP calls