Merge "Update EditorInfo if servedView's orientation changes" into main