Merge "Don't save touch location as a resting position." into rvc-dev am: d70e938d am: bb276a41 am: 0e7354f5 am: 11c9c609 Change-Id: I8551e216fc275d5cc047452cba1deae5425a914e