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

* commit 'd6ee33e84069846b0907948f8972978c30b34a3c':
  Fixed a bug where the QS was animating wrong when closing

Change-Id: I1c147f4f4ebf693ff218bd2b2fa1a3b890fe7c37