Fixes to TouchUp to return the current x and y values instead of the previous values

Change-Id: Idbf57b2bc5ad04bc352d149714469eb352776f92