Merge "Don't save touch location as a resting position." into rvc-dev am: d70e938d am: 54f9be8a am: d6ea5548 Change-Id: I81dd349317f4daf6527779d8b5f44f551552ea3b