Merge "Fix scrim animation when pressing stylus" into main