Merge "Add move to external display" into main