Updated code for various defect fixes for Appointment and calendar issue for non google users