Merge "Fix QS translation on tablets" into nyc-dev