Merge "QS: Don't animate first state change" into oc-dev
am: 462eeda68d

Change-Id: I73ff4ac6f2c79a23e4b8c57037927e2a811d0db5