Merge "Reload pointer icons from the UiThread" into main