Merge "Reset pointer icon when view is not present" into nyc-dev