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