Merge "Fixed a bug where expanding in the bottom stack messed up the whole layout" into nyc-dev