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