Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"