Merge "Fix QS -> QQS animation."