Merge "Fix # 2467153 (Handle change in attendee status from Calendar UI)"