UI-3229: [Calendar] Alignment Bugs on some screens
Merge commit 'f01fbb159e2d94cb69f25eea0ca73f8b050055ae' into HEAD