Merge "Fix bug preventing rejecting video calls"
am: 8bb8b998f6

Change-Id: I1f1f3564e9f4c7d33c1c3b41f3ab3b0fb6d63e09