Merge "Don't tint smart actions in shelf UI" into 24D1-dev