Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev