Merge "Cleaning up some StackView bad behavior" into honeycomb