Merge changes I151af596,Ib1ceddd7,I1cf84a09

* changes:
  QS: Don't animate first state change
  Fix QS getting stuck in weird animation during recreate
  Have QS fragment keep track of some state on recreate