Merge "Fix StylusDevicesControllerTest after adding a stylus setting" into main