Merge "Update display before dispatching config change" into main