Merge "Choose focused task by default with moveToNextDisplay" into main