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