Merge "Migrate Smooth display" into main