Merge "Update Car Intent Resolver UI" into main