CAL-977 Calendar is blank when change default view to List
Merge commit '11f9f383457382daf4b512a74371fc866288283a' into HEAD