Merge "Fixing leak in StackView"