Merge "Rename PointerIcon and Pointer Capture APIs"