Merge "Movement estimates for pointer location" am: 3803f0b564 am: 86cf7a6b7c
am: 58d4ff7f4c

Change-Id: I9051e7454d4097ed463745b3745e436635c6f272