Merge "Migrate DisplayScreen" into main