UI-3227 [ECMS] Alignment bug on some screens
Merge commit '29bc68087b444609329c0e04241dfd4073f5c749' into HEAD