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