Merge "Fixing a couple StackView bugs:" into honeycomb