Merge "QS: Fix RTL animation" into nyc-dev