Merge "QS: Fix QS touch breaking" into nyc-dev
am: 8fd8a4fde8

* commit '8fd8a4fde8356bf2d3eb2dda4b6d91e61e80c0c6':
  QS: Fix QS touch breaking

Change-Id: I741f1b1a2eedc734ce3e182b50f6cf17536ab0d8