Merge "Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)"