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

Change-Id: Iba00e1418ff0bd268fc717da1275d843ee09eba7