Merge "Add defer_display_events_when_frozen flag" into main