Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev