UI-2461: UI bugs when adding local and remote calendars