Merge "Pip: Use raw input coordiates when calculating pip movement offsets"