Merge "Fix QS crash with RTL rotate" into nyc-dev