Merge "Refresh pointer icons locally from ViewRootImpl" into main