Merge "Move tile icon resource loading off state change" into main