Merge "NSSL touch logs should spam the ShadeLog buffer instead of the NotifHeadsUpLog buffer" into udc-qpr-dev