Merge "Rotate display to user-rotation on plug-in" into main