[Only for master, not ee-6.2.x] LPS-50672 align controls vertically