Sync changes with BKC, make  calender event intent compatible with API9 and misc changes