Merge "Don't save touch location as a resting position." into rvc-dev am: d70e938de0

Change-Id: I4e1d64df84f36e12e4b49bb5befd8f97924edbd1