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

Change-Id: Ibd8022198364083a630eec8edf122b693bde40ee