Moved event instance mapping check for js widget to CalendarEventsListView
Merge remote-tracking branch 'origin/master'