am a049fe95: Merge "Fixing a couple StackView bugs:" into honeycomb

* commit 'a049fe95cdf68c73f104420433610d8a8a8a7357':
  Fixing a couple StackView bugs: