Merge "QS: Fix QS touch breaking" into nyc-dev