Merge "Handle null VideoCall"
am: 4950fd587f

Change-Id: Ic41035e8b06d97c7b3e4e1d3e78ba1c0ccebfdaa