Merge "Fix user rotation of display devices" into main