Merge changes I8a56254b,I618e363c into nyc-dev

* changes:
  Fix QS input handling
  Extract QS animations to QSContainer