Merge "Fixed a bug where expanding in the bottom stack messed up the whole...
Merge "Fixed a bug where expanding in the bottom stack messed up the whole layout" into nyc-dev am: 53c9fa98
am: 61b795b1
* commit '61b795b1':
Fixed a bug where expanding in the bottom stack messed up the whole layout