UI-3233: [PLF] Alignment Bugs on some screens
Merge commit '843e18adccd3b692cfd5dac5aa34a9b58e9bfcd3' into HEAD
Merge commit '8205187f510687df55339ef841d5caa8de7b2792' into HEAD