Merge "Make touchXOutsideOfQs require split shade to be enabled" into tm-qpr-dev