Merge "Move display to top when task gets moved to front in desktop mode" into main