UI-3231  [Answers] Alignment Bugs on some screens
Merge commit '1ce6581e0ad2e0f65677222b100ab11b6c923938' into HEAD
Merge commit '6f123268b00d0d488223ac141faab91726a2bbac' into HEAD