Merge "Fix bug preventing rejecting video calls"