Merge "Fixed a bug where the expand button was invisible" into nyc-dev