Merge "QS animation: fix clearing translation state" into nyc-dev