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

Change-Id: I49143de04b884cd4d4b85e31f0eea39cd5d34c43