Merge "[PS] Use `onSurface` for tint." into main