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