Merge "Fixing bottom part of QS not getting any touches in split shade" into sc-v2-dev