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

* commit '65eea842aff04f3949006315ffef5e7228f98051':
  Fixing a couple StackView bugs: