Merge "Fixing StackView bugs:" into honeycomb