UI-3233   [PLF] Alignment Bugs on some screens
Merge commit '3f499314fa53248d8473f36efb3c80eeaf7fe554' into HEAD
Merge commit '6a2ccc7c550cab460c117d8f481ae85206f71d1f' into HEAD