Merge "Move stylus hover icon setting to core settings" into main