Merge "Don't update layout of a view that hasn't been added yet" into main