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

Change-Id: I221518785b59e529fcacf78d6ca1c989fcd8561f