[13091934] Fix paging issues in calendar day and week views. Cherry picked from develop (2.3).