Merge "Retain black pointer stroke when selected, even for inverted icons like the hand." into main