Merge "Fix bug where stack view was getting clipped" into honeycomb