Merge "Update pointer icon when View.setPointerIcon is called" into nyc-dev