Merge "Fix custom pointer icon caching in ViewRootImpl"