am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb

* commit 'cdd5626da62cb2dc013cded470e264232617f635':
  Cleaning up some StackView bad behavior