Merge "Fix QS RTL" into nyc-dev