CAL-812 Improve performance of calendar switching view and startup
Merge commit '27d5be8807b0e4fe46d38214df66d2df5bf5b43d' into HEAD