Merge "Fix in StackView layout"