Merge "Remove movement estimates from pointer location"