Merge "Filling in holes in shade touch handling logging" into udc-dev